From: Andrew Cooper Date: Fri, 20 Jul 2018 14:21:51 +0000 (+0100) Subject: x86/shadow: Use MASK_* helpers for the MMIO fastpath PTE manipulation X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3377 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=c0bb03a5ef7e88ef4b43d3093e05635b3507b6d2;p=xen.git x86/shadow: Use MASK_* helpers for the MMIO fastpath PTE manipulation Drop the now-unused SH_L1E_MMIO_GFN_SHIFT definition. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Wei Liu Reviewed-by: Tim Deegan --- diff --git a/xen/arch/x86/mm/shadow/types.h b/xen/arch/x86/mm/shadow/types.h index 0430628042..8c0c802a49 100644 --- a/xen/arch/x86/mm/shadow/types.h +++ b/xen/arch/x86/mm/shadow/types.h @@ -317,12 +317,11 @@ static inline int sh_l1e_is_gnp(shadow_l1e_t sl1e) #define SH_L1E_MMIO_MAGIC 0xffffffff00000001ULL #define SH_L1E_MMIO_MAGIC_MASK 0xffffffff00000009ULL #define SH_L1E_MMIO_GFN_MASK 0x00000000fffffff0ULL -#define SH_L1E_MMIO_GFN_SHIFT 4 static inline shadow_l1e_t sh_l1e_mmio(gfn_t gfn, u32 gflags) { return (shadow_l1e_t) { (SH_L1E_MMIO_MAGIC - | (gfn_x(gfn) << SH_L1E_MMIO_GFN_SHIFT) + | MASK_INSR(gfn_x(gfn), SH_L1E_MMIO_GFN_MASK) | (gflags & (_PAGE_USER|_PAGE_RW))) }; } @@ -333,7 +332,7 @@ static inline int sh_l1e_is_mmio(shadow_l1e_t sl1e) static inline gfn_t sh_l1e_mmio_get_gfn(shadow_l1e_t sl1e) { - return _gfn((sl1e.l1 & SH_L1E_MMIO_GFN_MASK) >> SH_L1E_MMIO_GFN_SHIFT); + return _gfn(MASK_EXTR(sl1e.l1, SH_L1E_MMIO_GFN_MASK)); } static inline u32 sh_l1e_mmio_get_flags(shadow_l1e_t sl1e)